bitkeeper revision 1.1159.217.3 (41e3e41d3THhxhJrWMZu3Arcs8K-Rw)

Manual merge

diff --cc linux-2.6.10-xen-sparse/drivers/xen/blkfront/blkfront.c
index 040f2d93b7e23b2e59fa7d7eb3e92dc04f6dfea2,e81afa9f03cf42af775b92c3efa22d5d232e235f..79306b5771483729f5b1f0de923190bac54228a2
--- 1/linux-2.6.10-xen-sparse/drivers/xen/blkfront/blkfront.c
--- 2/linux-2.6.10-xen-sparse/drivers/xen/blkfront/blkfront.c
+++ b/linux-2.6.10-xen-sparse/drivers/xen/blkfront/blkfront.c
@@@ -367,11 -354,10 +349,10 @@@ static int blkif_queue_request(struct r
          }
      }
  
 -    req_prod++;
 -
 +    blk_ring.req_prod_pvt++;
 +    
      /* Keep a private copy so we can reissue requests when recovering. */
-     translate_req_to_pfn( &rec_ring[id], ring_req);
+     translate_req_to_pfn(&rec_ring[id], ring_req);
  
      return 0;
  }

diff --cc linux-2.6.10-xen-sparse/drivers/xen/blkfront/block.h
Simple merge